Merge branch 'master' of git://www.denx.de/git/u-boot
authorBen Warren <[email protected]>
Tue, 3 Jun 2008 05:55:42 +0000 (22:55 -0700)
committerBen Warren <[email protected]>
Tue, 3 Jun 2008 05:55:42 +0000 (22:55 -0700)

Trivial merge